From 5282d7df7f86e9727d2f99f797b632ad06134a19 Mon Sep 17 00:00:00 2001
From: oliskoli <oliskoli>
Date: Sun, 13 Aug 2006 17:19:59 +0000
Subject: [PATCH] Remove unused cet_vprintf. Change cet_fprintf to
 cet_gbfprintf with paramter 'gbfile'.

---
 cet_util.c | 57 ++++++++++++++++++++++--------------------------------
 cet_util.h |  3 +--
 2 files changed, 24 insertions(+), 36 deletions(-)

diff --git a/cet_util.c b/cet_util.c
index 5565ff22a..956d5e6f0 100644
--- a/cet_util.c
+++ b/cet_util.c
@@ -1102,55 +1102,44 @@ cet_disp_character_set_names(FILE *fout)
  *
  * - print any special hard-coded characters from inside a module - */
 
-int cet_vfprintf(FILE *stream, const cet_cs_vec_t *src_vec, const char *fmt, va_list args)
+int cet_gbfprintf(gbfile *stream, const cet_cs_vec_t *src_vec, const char *fmt, ...)
 {
 	char buff[128];
-	char *cout = buff;
 	int res, ct;
-	va_list args2;		/* vsnprintf makes args unusable for a second try */
-	
-	__va_copy(args2, args);
+	va_list args;
+	char *cout = buff;
+
+	va_start(args, fmt);
 	ct = vsnprintf(buff, sizeof(buff), fmt, args);
+	va_end(args);
+
 	if (ct >= (int)sizeof(buff)) {
-	    cout = xmalloc(ct + 1);
-	    vsnprintf(cout, ct + 1, fmt, args2);
+		cout = xmalloc(ct + 1);
+		va_start(args, fmt);
+		vsnprintf(cout, ct + 1, fmt, args);
+		va_end(args);
 	}
-	va_end(args2);
-	
+
 	if (global_opts.charset != src_vec)
 	{
-	    if (src_vec != &cet_cs_vec_utf8)
-	    {
-		char *ctemp = cet_str_any_to_utf8(cout, src_vec);
-		if (cout != buff) xfree(cout);
-		cout = ctemp;
-	    }
-	    if (global_opts.charset != &cet_cs_vec_utf8)
-	    {
-		char *ctemp = cet_str_utf8_to_any(cout, global_opts.charset);
-		if (cout != buff) xfree(cout);
-		cout = ctemp;
-	    }
+		if (src_vec != &cet_cs_vec_utf8) {
+			char *ctemp = cet_str_any_to_utf8(cout, src_vec);
+			if (cout != buff) xfree(cout);
+			cout = ctemp;
+		}
+		if (global_opts.charset != &cet_cs_vec_utf8) {
+			char *ctemp = cet_str_utf8_to_any(cout, global_opts.charset);
+			if (cout != buff) xfree(cout);
+			cout = ctemp;
+		}
 	}
 
-	res = fprintf(stream, "%s", cout);
+	res = gbfprintf(stream, "%s", cout);
 	if (cout != buff) xfree(cout);
 	
 	return res;
 }
 
-int cet_fprintf(FILE *stream, const cet_cs_vec_t *src_vec, const char *fmt, ...)
-{
-	int res;
-	va_list args;
-	
-	va_start(args, fmt);
-	res = cet_vfprintf(stream, src_vec, fmt, args);
-	va_end(args);
-	
-	return res;
-}
-
 /*
  * 'str'  points to an array of XML_Chars which may be UNICODE16
  * words in native endianness.
diff --git a/cet_util.h b/cet_util.h
index 96febcd88..998c83ef0 100644
--- a/cet_util.h
+++ b/cet_util.h
@@ -99,8 +99,7 @@ char *cet_str_uni_to_any(const short *src, int length, const cet_cs_vec_t *dest_
 char *cet_str_any_to_any(const char *src, const cet_cs_vec_t *src_vec, const cet_cs_vec_t *dest_vec);
 int cet_valid_char(const char *src, const cet_cs_vec_t *vec);
 
-int cet_vfprintf(FILE *stream, const cet_cs_vec_t *src_vec, const char *fmt, va_list args);
-int cet_fprintf(FILE *stream, const cet_cs_vec_t *src_vec, const char *fmt, ...);
+int cet_gbfprintf(gbfile *stream, const cet_cs_vec_t *src_vec, const char *fmt, ...);
 
 /* cet_convert_string: !!! ONLY VALID WITHIN 'cet_convert_strings' process !!! */
 char *cet_convert_string(char *str);
-- 
2.30.2